Merge from origin/emacs-27

author Glenn Morris <rgm@gnu.org>

Wed, 3 Feb 2021 16:11:08 +0000 (08:11 -0800)

committer Glenn Morris <rgm@gnu.org>

Wed, 3 Feb 2021 16:11:08 +0000 (08:11 -0800)
author Glenn Morris <rgm@gnu.org>
Wed, 3 Feb 2021 16:11:08 +0000 (08:11 -0800)
committer Glenn Morris <rgm@gnu.org>
Wed, 3 Feb 2021 16:11:08 +0000 (08:11 -0800)
diff --cc src/nsfns.m
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Glenn Morris <rgm@gnu.org>
	Wed, 3 Feb 2021 16:11:08 +0000 (08:11 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Wed, 3 Feb 2021 16:11:08 +0000 (08:11 -0800)
		1	2
src/nsfns.m	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history